Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/update to gfdl 20210308 #61

Merged

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Mar 9, 2021

Description of changes

Issues Fixed (include github issue #):

Are changes expected to change answers?

  • No

Testing performed:

  • machine: orion, hera and dell-p3

Hashes used for testing

herrwang0 and others added 30 commits February 19, 2021 22:47
initialized in MOM_barotropic
2. Split the loop that addes Rayleigh drag term to [uv]_accel_bt, so that the if-block is now outside the loop
  Created the new config_src directory tree structure, as agreed upon at
https://github.com/NOAA-GFDL/MOM6/discussions/1286, to eventually accomodate the
selection of different infrastructures.  No .F90 files are changed but there are
small changes to ac/configure.ac to accomodate the new structure while also
allowing for the old target to use the old structure.  All answers are bitwise
identical, and all MOM6-examples and TC tests are passing.
…leigh

Fix the bug that Rayleigh_[uv] was not initialized in MOM_barotropic
  Updated the MOM6/docs files and .gitlab-ci.yml to reflect the new config_src
directory structure.
- Use a new branch of MRS in the gitlab pipelines
- The job within the gitlab pipeline gnu:ice-ocean-nolibs had a modified
  search path but a "," instead of a "/" led to al caps being compiled
  and thus failure.
This patch removes the AC_CHECK_FILE autoconf macro which assigns a
default path to the MOM_memory.h file path.

This path was defaulting back to the old directory, and was added to
support the regression verification testing, but this is a regression
problem with should be handled by the regression, not the autoconf
configuration.

This will produce a regression test fail, but it not a cause for concern.
Remove AC_CHECK_FILE for legacy MOM_memory.h
This patch removes two lines where the target build (used for regression
testing) were using the active branch's configure.ac, which caused path
mismatches.  We now use our local autoconf configuration files.

This patch also fixes a typo in the source code dependencies of the
target repository.

The AC_CHECK_FILE for the solo driver has also beed removed, for the
same reason as the MOM_memory.h check.

Some comments were also added or reformatted to undocumented flags.
Testing: Target uses local autoconf
…ssingline

Fix a missing line regarding vel_underflow
Depth-integrated momentum budget diagnostics
@BrianCurtis-NOAA
Copy link

In the main comment to the PR, If you change:
"MOM6 Issue #60" to "Closes #60", then the merge of this PR will automatically close that issue.

@jiandewang
Copy link
Collaborator Author

@BrianCurtis-NOAA Thanks for the useful information. BTW, do you think the change I made in this PR is fine ? I made test run without problem.

@BrianCurtis-NOAA
Copy link

I haven't looked through anything, but I don't know much about the MOM6 source code. I only read through the makefile while working on the cmake port.

@jiandewang
Copy link
Collaborator Author

@BrianCurtis-NOAA there is no any code content change of MOM6 in this PR, the changes are on directory structure

@jiandewang
Copy link
Collaborator Author

the changes in MOM6 directories are:
(1) rename config_src/nuopc_driver to config_src/drivers/nuopc_cap
(2) rename config_src/solo_driver to config_src/driver/solo_driver
(3) extract all infra.F90 files from src/framework to src/config_src/infra/FMS1
(4) rename config_src/dynamic to config_src/memory/dynamic_nonsymmetric

@BrianCurtis-NOAA
Copy link

The directory structure changes will need to be noted for the MOM6-interface in ufs. At first glance there will be file locations to update in mom6_files. But thats just to note for when you work on the PR over in ufs.

@jiandewang
Copy link
Collaborator Author

@BrianCurtis-NOAA yes I put them on ufs PR, see ufs-community/ufs-weather-model#458

@jiandewang jiandewang merged commit e5a4035 into NOAA-EMC:dev/emc Mar 13, 2021
jiandewang pushed a commit to jiandewang/MOM6 that referenced this pull request Jun 17, 2021
@jiandewang jiandewang deleted the feature/update-to-GFDL-20210308 branch February 28, 2023 03:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update MOM6 to GFDL 20210308 commit
9 participants